Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OCPBUGS-45910: Fix cpu clockspeed for s390x #857

Conversation

apodvrat
Copy link
Contributor

@apodvrat apodvrat commented Dec 16, 2024

For s390x architectures lscpu does not return the clock speed by "CPU MHz" or "CPU max MHz" field but have two fields (CPU static MHz and CPU dynamic MHz).
"CPU static MHz" is the field representing the designed clock speed whereas the "CPU dynamic MHz" is representing the current CPU speed (throttled or energy saving).
New test case for s390x architecture was added.
In addition the machine type was fixed, too.

The fix was tested using unit tests:

JUnit path was configured: ./junit_unit_test.xml

JUnit report was created: /root/code/Assisted_Installer/latest/assisted-installer-agent/src/inventory/junit_unit_test.xml

Ran 121 of 121 Specs in 0.268 seconds
SUCCESS! -- 121 Passed | 0 Failed | 0 Pending | 0 Skipped
--- PASS: TestInventory (0.30s)

@openshift-ci openshift-ci bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Dec 16, 2024
Copy link

codecov bot commented Dec 16, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 60.47%. Comparing base (ecb65f1) to head (e85a41a).
Report is 11 commits behind head on master.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #857      +/-   ##
==========================================
- Coverage   60.54%   60.47%   -0.07%     
==========================================
  Files          75       75              
  Lines        3992     4003      +11     
==========================================
+ Hits         2417     2421       +4     
- Misses       1405     1410       +5     
- Partials      170      172       +2     
Files with missing lines Coverage Δ
src/inventory/cpu.go 93.10% <100.00%> (ø)

... and 2 files with indirect coverage changes

@AmadeusPodvratnik
Copy link
Contributor

/retest

2 similar comments
@AmadeusPodvratnik
Copy link
Contributor

/retest

@apodvrat
Copy link
Contributor Author

/retest

@apodvrat apodvrat force-pushed the OCPBUGS_45910_s390x_fix_cpu_clockspeed branch from 57ee99b to bd5c5ec Compare December 17, 2024 16:10
@apodvrat
Copy link
Contributor Author

/retest

1 similar comment
@AmadeusPodvratnik
Copy link
Contributor

/retest

@apodvrat apodvrat force-pushed the OCPBUGS_45910_s390x_fix_cpu_clockspeed branch from bd5c5ec to e7b2a0e Compare December 18, 2024 13:48
src/inventory/cpu_test.go Outdated Show resolved Hide resolved
@apodvrat apodvrat force-pushed the OCPBUGS_45910_s390x_fix_cpu_clockspeed branch 2 times, most recently from 603b7ac to 914474f Compare December 19, 2024 15:07
@apodvrat
Copy link
Contributor Author

/retest

1 similar comment
@apodvrat
Copy link
Contributor Author

apodvrat commented Jan 7, 2025

/retest

@paul-maidment
Copy link
Contributor

/override ci/prow/edge-e2e-oci-assisted-4-18

@paul-maidment
Copy link
Contributor

/override ci/prow/okd-scos-e2e-aws-ovn

@paul-maidment
Copy link
Contributor

/lgtm

Copy link

openshift-ci bot commented Jan 7, 2025

@paul-maidment: Overrode contexts on behalf of paul-maidment: ci/prow/edge-e2e-oci-assisted-4-18

In response to this:

/override ci/prow/edge-e2e-oci-assisted-4-18

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 7, 2025
Copy link

openshift-ci bot commented Jan 7, 2025

@paul-maidment: Overrode contexts on behalf of paul-maidment: ci/prow/okd-scos-e2e-aws-ovn

In response to this:

/override ci/prow/okd-scos-e2e-aws-ovn

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@paul-maidment
Copy link
Contributor

/approve

Copy link

openshift-ci bot commented Jan 7, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: apodvrat, paul-maidment

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 7, 2025
@paul-maidment
Copy link
Contributor

/jira refresh

@openshift-ci-robot
Copy link

@paul-maidment: No Jira issue is referenced in the title of this pull request.
To reference a jira issue, add 'XYZ-NNN:' to the title of this pull request and request another refresh with /jira refresh.

In response to this:

/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@apodvrat apodvrat changed the title OCPBUGS_45910: Fix cpu clockspeed for s390x OCPBUGS-45910: Fix cpu clockspeed for s390x Jan 7, 2025
@openshift-ci-robot openshift-ci-robot added jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jan 7, 2025
@openshift-ci-robot
Copy link

@apodvrat: This pull request references Jira Issue OCPBUGS-45910, which is invalid:

  • expected the bug to target either version "4.19." or "openshift-4.19.", but it targets "4.18.z" instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

For s390x architectures lscpu does not return the clock speed by "CPU MHz" or "CPU max MHz" field but have two fields (CPU static MHz and CPU dynamic MHz).
"CPU static MHz" is the field representing the designed clock speed whereas the "CPU dynamic MHz" is representing the current CPU speed (throttled or energy saving).
New test case for s390x architecture was added.
In addition the machine type was fixed, too.

The fix was tested using unit tests:

JUnit path was configured: ./junit_unit_test.xml

JUnit report was created: /root/code/Assisted_Installer/latest/assisted-installer-agent/src/inventory/junit_unit_test.xml

Ran 121 of 121 Specs in 0.268 seconds
SUCCESS! -- 121 Passed | 0 Failed | 0 Pending | 0 Skipped
--- PASS: TestInventory (0.30s)

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@apodvrat
Copy link
Contributor Author

apodvrat commented Jan 7, 2025

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jan 7, 2025
@openshift-ci-robot
Copy link

@apodvrat: This pull request references Jira Issue OCPBUGS-45910, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.19.0) matches configured target version for branch (4.19.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

In response to this:

/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@apodvrat
Copy link
Contributor Author

apodvrat commented Jan 7, 2025

/jira refresh

@openshift-ci-robot
Copy link

@apodvrat: This pull request references Jira Issue OCPBUGS-45910, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.19.0) matches configured target version for branch (4.19.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

In response to this:

/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@apodvrat
Copy link
Contributor Author

apodvrat commented Jan 7, 2025

/jira refresh

@openshift-ci-robot
Copy link

@apodvrat: This pull request references Jira Issue OCPBUGS-45910, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.19.0) matches configured target version for branch (4.19.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

In response to this:

/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@apodvrat apodvrat force-pushed the OCPBUGS_45910_s390x_fix_cpu_clockspeed branch from 914474f to e85a41a Compare January 8, 2025 07:29
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jan 8, 2025
@AmadeusPodvratnik
Copy link
Contributor

/retest

1 similar comment
@AmadeusPodvratnik
Copy link
Contributor

/retest

@paul-maidment
Copy link
Contributor

/lgtm

@paul-maidment
Copy link
Contributor

/override ci/prow/edge-e2e-oci-assisted-4-18

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 8, 2025
Copy link

openshift-ci bot commented Jan 8, 2025

@paul-maidment: Overrode contexts on behalf of paul-maidment: ci/prow/edge-e2e-oci-assisted-4-18

In response to this:

/override ci/prow/edge-e2e-oci-assisted-4-18

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

Copy link

openshift-ci bot commented Jan 8, 2025

@apodvrat: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@apodvrat
Copy link
Contributor Author

apodvrat commented Jan 8, 2025

/retest

@openshift-merge-bot openshift-merge-bot bot merged commit 5db12a7 into openshift:master Jan 8, 2025
21 checks passed
@openshift-ci-robot
Copy link

@apodvrat: Jira Issue OCPBUGS-45910: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-45910 has been moved to the MODIFIED state.

In response to this:

For s390x architectures lscpu does not return the clock speed by "CPU MHz" or "CPU max MHz" field but have two fields (CPU static MHz and CPU dynamic MHz).
"CPU static MHz" is the field representing the designed clock speed whereas the "CPU dynamic MHz" is representing the current CPU speed (throttled or energy saving).
New test case for s390x architecture was added.
In addition the machine type was fixed, too.

The fix was tested using unit tests:

JUnit path was configured: ./junit_unit_test.xml

JUnit report was created: /root/code/Assisted_Installer/latest/assisted-installer-agent/src/inventory/junit_unit_test.xml

Ran 121 of 121 Specs in 0.268 seconds
SUCCESS! -- 121 Passed | 0 Failed | 0 Pending | 0 Skipped
--- PASS: TestInventory (0.30s)

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@apodvrat
Copy link
Contributor Author

apodvrat commented Jan 8, 2025

/cherry-pick release-4.18

@openshift-cherrypick-robot

@apodvrat: new pull request created: #888

In response to this:

/cherry-pick release-4.18

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

Distgit: ose-agent-installer-node-agent
This PR has been included in build ose-agent-installer-node-agent-container-v4.19.0-202501081838.p0.g5db12a7.assembly.stream.el9.
All builds following this will include this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants